Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #1 #10

Merged
merged 2 commits into from
Aug 23, 2024
Merged

Fix #1 #10

merged 2 commits into from
Aug 23, 2024

Conversation

NicBOMB
Copy link
Contributor

@NicBOMB NicBOMB commented Aug 23, 2024

The included wrapper script to launch proton mail fails on wayland due to the if condition on line 70 checking for a non existent file in the $XDG_RUNTIME_DIR. Fixing that condition does minimally resolve the issue.

However, completely removing the script in favor of a single env var is far simpler. Proton Mail Beta's asar'd package.json includes '"electron": "29.0.1"'. Since Electron 28.x.x, wayland support can be enabled via the ELECTRON_OZONE_PLATFORM_HINT env var.
https://releases.electronjs.org/release/v28.0.0
https://www.electronjs.org/docs/latest/api/environment-variables#electron_ozone_platform_hint-linux

Although Element is a noteworthy electron app example, its configuration is far older and carries fixes related to old electron versions. Any past conflicts with specific users' graphics drivers are likely not relevant anymore.
flathub/im.riot.Riot#452 (comment)
Script source for Element on electron 13: flathub/im.riot.Riot@2b9214a

@flathubbot
Copy link
Contributor

Started test build 142015

@flathubbot
Copy link
Contributor

Build 142015 successful
To test this build, install it from the testing repository:

flatpak install --user https://dl.flathub.org/build-repo/125069/me.proton.Mail.flatpakref

@NicBOMB
Fix flathub#1
d8ee603 
replace shell script with environment variable for wayland compatibility

also add builddir to gitignore per flatpak builder docs build command
@flathubbot
Copy link
Contributor

Started test build 142026

@flathubbot
Copy link
Contributor

Build 142026 successful
To test this build, install it from the testing repository:

flatpak install --user https://dl.flathub.org/build-repo/125079/me.proton.Mail.flatpakref

@NicBOMB
Copy link
Contributor Author

NicBOMB commented Aug 23, 2024

Build 142026 successful To test this build, install it from the testing repository:

flatpak install --user https://dl.flathub.org/build-repo/125079/me.proton.Mail.flatpakref

@proletarius101 This build is running.
In my first commit I accidentally wrote /app/proton-pass/Proton Mail Beta, which is why I did a force-push to cleanup those commits.

refi64/Cobalt is probably unnecessary for any electron app ver >=28.x.x unless it needs a lot of specific feature flags. Likely none of the Proton apps need those.
See also flathub/me.proton.Pass#20 (comment)

@proletarius101
Copy link
Collaborator

Thanks for the contribution and elaboration! Everything looks great to me.

@proletarius101 proletarius101 merged commit 7dcfd43 into flathub:master Aug 23, 2024
1 check passed
@proletarius101 proletarius101 mentioned this pull request Aug 23, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@NicBOMB @flathubbot @proletarius101